| Message ID | 20240503181333.2336999-1-eahariha@linux.microsoft.com |
|---|---|
| Headers | show |
| Series | Make I2C terminology more inclusive for I2C Algobit and consumers | expand |
On Fri, May 03, 2024 at 02:04:15PM -0700, Easwar Hariharan wrote: > On 5/3/2024 12:34 PM, Rodrigo Vivi wrote: > > On Fri, May 03, 2024 at 06:13:24PM +0000, Easwar Hariharan wrote: > >> I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" > >> with more appropriate terms. Inspired by and following on to Wolfram's > >> series to fix drivers/i2c/[1], fix the terminology for users of > >> I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists > >> in the specification. > >> > >> Compile tested, no functionality changes intended > >> > >> [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ > >> > >> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > >> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > > > > It looks like the ack is not needed since we are merging this through > > drm-intel-next. But I'm planing to merge this only after seeing the > > main drivers/i2c accepting the new terminology. So we don't have a > > risk of that getting push back and new names there and we having > > to rename it once again. > > Just to be explicit, did you want me to remove the Acked-by in v3, or will you when you pull > the patch into drm-intel-next? > > > > > (more below) > > > >> Acked-by: Zhi Wang <zhiwang@kernel.org> > >> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > > > > Cc: Jani Nikula <jani.nikula@intel.com> > > > > Jani, what bits were you concerned that were not necessarily i2c? > > I believe although not necessarily/directly i2c, I believe they > > are related and could benefit from the massive single shot renable. > > or do you have any better split to suggest here? > > > > (more below) > > > >> --- > >> drivers/gpu/drm/i915/display/dvo_ch7017.c | 14 ++++----- > >> drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 18 +++++------ > >> drivers/gpu/drm/i915/display/dvo_ivch.c | 16 +++++----- > >> drivers/gpu/drm/i915/display/dvo_ns2501.c | 18 +++++------ > >> drivers/gpu/drm/i915/display/dvo_sil164.c | 18 +++++------ > >> drivers/gpu/drm/i915/display/dvo_tfp410.c | 18 +++++------ > >> drivers/gpu/drm/i915/display/intel_bios.c | 22 +++++++------- > >> drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- > >> .../gpu/drm/i915/display/intel_display_core.h | 2 +- > >> drivers/gpu/drm/i915/display/intel_dsi.h | 2 +- > >> drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 ++++++------- > >> drivers/gpu/drm/i915/display/intel_dvo.c | 14 ++++----- > >> drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- > >> drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +-- > >> drivers/gpu/drm/i915/display/intel_sdvo.c | 30 +++++++++---------- > >> drivers/gpu/drm/i915/display/intel_vbt_defs.h | 4 +-- > >> drivers/gpu/drm/i915/gvt/edid.c | 28 ++++++++--------- > >> drivers/gpu/drm/i915/gvt/edid.h | 4 +-- > >> drivers/gpu/drm/i915/gvt/opregion.c | 2 +- > >> 19 files changed, 119 insertions(+), 119 deletions(-) > >> > > <snip> > > >> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > >> index c17462b4c2ac..64db211148a8 100644 > >> --- a/drivers/gpu/drm/i915/display/intel_ddi.c > >> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > >> @@ -4332,7 +4332,7 @@ static int intel_ddi_compute_config_late(struct intel_encoder *encoder, > >> connector->tile_group->id); > >> > >> /* > >> - * EDP Transcoders cannot be ensalved > >> + * EDP Transcoders cannot be slaves > > > > ^ here > > perhaps you meant 'targeted' ? > > > >> * make them a master always when present > > <snip> > > This is not actually I2C related as far as I could tell when I was making the change, so this was more of a typo fix. > > If we want to improve this, a quick check with the eDP v1.5a spec suggests using primary/secondary instead, > though in a global fashion rather than specifically for eDP transcoders. There is also source/sink terminology > in the spec related to DP encoders. > > Which would be a more acceptable change here? hmmm probably better to split the patches and align with the spec naming where it applies. and with i2c name where it applies. > > Thanks, > Easwar
On Fri, 03 May 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote: > On Fri, May 03, 2024 at 02:04:15PM -0700, Easwar Hariharan wrote: >> On 5/3/2024 12:34 PM, Rodrigo Vivi wrote: >> > On Fri, May 03, 2024 at 06:13:24PM +0000, Easwar Hariharan wrote: >> >> I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" >> >> with more appropriate terms. Inspired by and following on to Wolfram's >> >> series to fix drivers/i2c/[1], fix the terminology for users of >> >> I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists >> >> in the specification. >> >> >> >> Compile tested, no functionality changes intended >> >> >> >> [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ >> >> >> >> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> >> >> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> >> > >> > It looks like the ack is not needed since we are merging this through >> > drm-intel-next. But I'm planing to merge this only after seeing the >> > main drivers/i2c accepting the new terminology. So we don't have a >> > risk of that getting push back and new names there and we having >> > to rename it once again. >> >> Just to be explicit, did you want me to remove the Acked-by in v3, or will you when you pull >> the patch into drm-intel-next? >> >> > >> > (more below) >> > >> >> Acked-by: Zhi Wang <zhiwang@kernel.org> >> >> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> >> > >> > Cc: Jani Nikula <jani.nikula@intel.com> >> > >> > Jani, what bits were you concerned that were not necessarily i2c? >> > I believe although not necessarily/directly i2c, I believe they >> > are related and could benefit from the massive single shot renable. >> > or do you have any better split to suggest here? >> > >> > (more below) >> > >> >> --- >> >> drivers/gpu/drm/i915/display/dvo_ch7017.c | 14 ++++----- >> >> drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 18 +++++------ >> >> drivers/gpu/drm/i915/display/dvo_ivch.c | 16 +++++----- >> >> drivers/gpu/drm/i915/display/dvo_ns2501.c | 18 +++++------ >> >> drivers/gpu/drm/i915/display/dvo_sil164.c | 18 +++++------ >> >> drivers/gpu/drm/i915/display/dvo_tfp410.c | 18 +++++------ >> >> drivers/gpu/drm/i915/display/intel_bios.c | 22 +++++++------- >> >> drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- >> >> .../gpu/drm/i915/display/intel_display_core.h | 2 +- >> >> drivers/gpu/drm/i915/display/intel_dsi.h | 2 +- >> >> drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 ++++++------- >> >> drivers/gpu/drm/i915/display/intel_dvo.c | 14 ++++----- >> >> drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- >> >> drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +-- >> >> drivers/gpu/drm/i915/display/intel_sdvo.c | 30 +++++++++---------- >> >> drivers/gpu/drm/i915/display/intel_vbt_defs.h | 4 +-- >> >> drivers/gpu/drm/i915/gvt/edid.c | 28 ++++++++--------- >> >> drivers/gpu/drm/i915/gvt/edid.h | 4 +-- >> >> drivers/gpu/drm/i915/gvt/opregion.c | 2 +- >> >> 19 files changed, 119 insertions(+), 119 deletions(-) >> >> >> >> <snip> >> >> >> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >> >> index c17462b4c2ac..64db211148a8 100644 >> >> --- a/drivers/gpu/drm/i915/display/intel_ddi.c >> >> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c >> >> @@ -4332,7 +4332,7 @@ static int intel_ddi_compute_config_late(struct intel_encoder *encoder, >> >> connector->tile_group->id); >> >> >> >> /* >> >> - * EDP Transcoders cannot be ensalved >> >> + * EDP Transcoders cannot be slaves >> > >> > ^ here >> > perhaps you meant 'targeted' ? >> > >> >> * make them a master always when present >> >> <snip> >> >> This is not actually I2C related as far as I could tell when I was making the change, so this was more of a typo fix. >> >> If we want to improve this, a quick check with the eDP v1.5a spec suggests using primary/secondary instead, >> though in a global fashion rather than specifically for eDP transcoders. There is also source/sink terminology >> in the spec related to DP encoders. >> >> Which would be a more acceptable change here? > > hmmm probably better to split the patches and align with the spec naming where it applies. > and with i2c name where it applies. Yeah this one is completely unrelated to i2c and aux, and what the eDP spec says is irrelevant here. This should follow Intel hw specs. BR, Jani.
Am 03.05.24 um 20:13 schrieb Easwar Hariharan: > I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" > with more appropriate terms. Inspired by and following on to Wolfram's > series to fix drivers/i2c/[1], fix the terminology for users of > I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists > in the specification. > > Compile tested, no functionality changes intended > > [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ > > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/video/fbdev/smscufx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c > index 35d682b110c4..5f0dd01fd834 100644 > --- a/drivers/video/fbdev/smscufx.c > +++ b/drivers/video/fbdev/smscufx.c > @@ -1292,7 +1292,7 @@ static int ufx_realloc_framebuffer(struct ufx_data *dev, struct fb_info *info) > return 0; > } > > -/* sets up I2C Controller for 100 Kbps, std. speed, 7-bit addr, master, > +/* sets up DDC channel for 100 Kbps, std. speed, 7-bit addr, controller mode, > * restart enabled, but no start byte, enable controller */ > static int ufx_i2c_init(struct ufx_data *dev) > { > @@ -1321,7 +1321,7 @@ static int ufx_i2c_init(struct ufx_data *dev) > /* 7-bit (not 10-bit) addressing */ > tmp &= ~(0x10); > > - /* enable restart conditions and master mode */ > + /* enable restart conditions and controller mode */ > tmp |= 0x21; > > status = ufx_reg_write(dev, 0x1000, tmp);
I2C v7, SMBus 3.2, and I3C 1.1.1 specifications have replaced "master/slave" with more appropriate terms. Inspired by and following on to Wolfram's series to fix drivers/i2c/[1], fix the terminology for users of the I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists in the specification. Compile tested, no functionality changes intended Please chime in with your opinions and suggestions. This series is based on 3d25a941ea50 ("Merge tag 'block-6.9-20240503' of git://git.kernel.dk/linux") [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/ ---- changelog: v1->v2: - v1 link: https://lore.kernel.org/all/20240430173812.1423757-1-eahariha@linux.microsoft.com/ - Switch to specification verbiage master->controller, slave->target, drop usage of host/client [Thomas] - Pick up Reviewed-bys and Acked-bys from Rodrigo, Zhi, and Thomas [gma500, i915] - Fix up some straggler master/slave terms in amdgpu, cx25821, ivtv, cx23885 v0->v1: - v0 link: https://lore.kernel.org/all/20240329170038.3863998-1-eahariha@linux.microsoft.com/ - Drop drivers/infiniband patches [Leon, Dennis] - Switch to specification verbiage master->controller, slave->target, drop usage of client [Andi, Ville, Jani, Christian] - Add I3C specification version in commit messages [Andi] - Pick up Reviewed-bys from Martin and Simon [sfc] - Drop i2c/treewide patch to make this series independent from Wolfram's ([1]) [Wolfram] - Split away drm/nouveau patch to allow expansion into non-I2C non-inclusive terms ---- Easwar Hariharan (12): drm/amdgpu, drm/radeon: Make I2C terminology more inclusive drm/gma500: Make I2C terminology more inclusive drm/i915: Make I2C terminology more inclusive media: au0828: Make I2C terminology more inclusive media: cobalt: Make I2C terminology more inclusive media: cx18: Make I2C terminology more inclusive media: cx25821: Make I2C terminology more inclusive media: ivtv: Make I2C terminology more inclusive media: cx23885: Make I2C terminology more inclusive sfc: falcon: Make I2C terminology more inclusive fbdev/smscufx: Make I2C terminology more inclusive fbdev/viafb: Make I2C terminology more inclusive .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 10 +++---- drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 8 ++--- drivers/gpu/drm/amd/amdgpu/atombios_i2c.h | 2 +- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 20 ++++++------- .../gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +- .../drm/amd/display/dc/bios/bios_parser2.c | 2 +- .../drm/amd/display/dc/core/dc_link_exports.c | 4 +-- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- drivers/gpu/drm/amd/display/dc/dce/dce_i2c.c | 4 +-- .../display/include/grph_object_ctrl_defs.h | 2 +- drivers/gpu/drm/amd/include/atombios.h | 2 +- drivers/gpu/drm/amd/include/atomfirmware.h | 26 ++++++++-------- .../powerplay/hwmgr/vega20_processpptables.c | 4 +-- .../amd/pm/powerplay/inc/smu11_driver_if.h | 2 +- .../inc/pmfw_if/smu11_driver_if_arcturus.h | 2 +- .../inc/pmfw_if/smu11_driver_if_navi10.h | 2 +- .../pmfw_if/smu11_driver_if_sienna_cichlid.h | 2 +- .../inc/pmfw_if/smu13_driver_if_aldebaran.h | 2 +- .../inc/pmfw_if/smu13_driver_if_v13_0_0.h | 2 +- .../inc/pmfw_if/smu13_driver_if_v13_0_7.h | 2 +- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 4 +-- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 ++--- drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +- drivers/gpu/drm/gma500/intel_bios.c | 22 +++++++------- drivers/gpu/drm/gma500/intel_bios.h | 4 +-- drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- drivers/gpu/drm/gma500/psb_drv.h | 2 +- drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 +-- drivers/gpu/drm/gma500/psb_intel_sdvo.c | 26 ++++++++-------- drivers/gpu/drm/i915/display/dvo_ch7017.c | 14 ++++----- drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 18 +++++------ drivers/gpu/drm/i915/display/dvo_ivch.c | 16 +++++----- drivers/gpu/drm/i915/display/dvo_ns2501.c | 18 +++++------ drivers/gpu/drm/i915/display/dvo_sil164.c | 18 +++++------ drivers/gpu/drm/i915/display/dvo_tfp410.c | 18 +++++------ drivers/gpu/drm/i915/display/intel_bios.c | 22 +++++++------- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- .../gpu/drm/i915/display/intel_display_core.h | 2 +- drivers/gpu/drm/i915/display/intel_dsi.h | 2 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 ++++++------- drivers/gpu/drm/i915/display/intel_dvo.c | 14 ++++----- drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +-- drivers/gpu/drm/i915/display/intel_sdvo.c | 30 +++++++++---------- drivers/gpu/drm/i915/display/intel_vbt_defs.h | 4 +-- drivers/gpu/drm/i915/gvt/edid.c | 28 ++++++++--------- drivers/gpu/drm/i915/gvt/edid.h | 4 +-- drivers/gpu/drm/i915/gvt/opregion.c | 2 +- drivers/gpu/drm/radeon/atombios.h | 16 +++++----- drivers/gpu/drm/radeon/atombios_i2c.c | 4 +-- drivers/gpu/drm/radeon/radeon_combios.c | 28 ++++++++--------- drivers/gpu/drm/radeon/radeon_i2c.c | 10 +++---- drivers/gpu/drm/radeon/radeon_mode.h | 6 ++-- drivers/media/pci/cobalt/cobalt-i2c.c | 6 ++-- drivers/media/pci/cx18/cx18-av-firmware.c | 8 ++--- drivers/media/pci/cx18/cx18-cards.c | 6 ++-- drivers/media/pci/cx18/cx18-cards.h | 4 +-- drivers/media/pci/cx18/cx18-gpio.c | 6 ++-- drivers/media/pci/cx23885/cx23885-core.c | 6 ++-- drivers/media/pci/cx23885/cx23885-f300.c | 8 ++--- drivers/media/pci/cx23885/cx23885-i2c.c | 6 ++-- drivers/media/pci/cx23885/cx23885.h | 2 +- drivers/media/pci/cx25821/cx25821-core.c | 2 +- drivers/media/pci/cx25821/cx25821-i2c.c | 6 ++-- .../media/pci/cx25821/cx25821-medusa-video.c | 2 +- drivers/media/pci/cx25821/cx25821.h | 2 +- drivers/media/pci/ivtv/ivtv-i2c.c | 20 ++++++------- drivers/media/usb/au0828/au0828-i2c.c | 4 +-- drivers/media/usb/au0828/au0828-input.c | 2 +- drivers/net/ethernet/sfc/falcon/falcon.c | 2 +- drivers/video/fbdev/smscufx.c | 4 +-- drivers/video/fbdev/via/chip.h | 8 ++--- drivers/video/fbdev/via/dvi.c | 24 +++++++-------- drivers/video/fbdev/via/lcd.c | 6 ++-- drivers/video/fbdev/via/via_aux.h | 2 +- drivers/video/fbdev/via/via_i2c.c | 12 ++++---- drivers/video/fbdev/via/vt1636.c | 6 ++-- 79 files changed, 321 insertions(+), 321 deletions(-) base-commit: 3d25a941ea5013b552b96330c83052ccace73a48